Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:34:27 +0000 (07:34 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:34:27 +0000 (07:34 +0800)
commit47466a7c1c089decaddcf54ae2826f75219126b6
tree18fc99d248ff675d5e392f879d19e88cf70acc29
parent1d8c83d008cabb819dc54631fc9006541e751e51
parent46542cb614f6f6952f56467142f8083544eba173
Merge from mainline.
doc/emacs/ChangeLog
lisp/ChangeLog